Manual merge.
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Mon, 1 Aug 2005 10:48:24 +0000 (10:48 +0000)
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Mon, 1 Aug 2005 10:48:24 +0000 (10:48 +0000)
commitd4abe259d42b2bc6b92c29db9d1eba7c21341862
tree8a1e8f59c55f7fa22a88f8ba432dc69405112220
parent7b63edab8e03f4d0e13fbd121d93e99844a7bd98
parentdf47943bc5345bf3ccbdbcdffebc520d0c14f225
Manual merge.
linux-2.4-xen-sparse/arch/xen/kernel/time.c
linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32